dgit.raspbian.org Git - emacs.git/commit

projects / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d599f2f 586f135)

author	Glenn Morris <rgm@gnu.org>
	Tue, 18 Jan 2011 02:49:59 +0000 (18:49 -0800)
committer	Glenn Morris <rgm@gnu.org>
	Tue, 18 Jan 2011 02:49:59 +0000 (18:49 -0800)
commit	cc8c9d22b29696a7bf006c7a0f31d64c6cf3aff4
tree	7fadfe9700e51547bcb480743467705807a4ba96	tree \| snapshot
parent	d599f2f185c0271c6238bbd616f49ab784a6d5cc	commit \| diff
parent	586f135e4b947831fa3831ef239c4655c0cc4c1c	commit \| diff

Merge from emacs-23 branch, up to r100386.

etc/ChangeLog	diff1 \|	diff2 \|	blob \| history
etc/PROBLEMS	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/emacs-lisp/easy-mmode.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/image.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.